(vc-default-mark-resolved): New function.

diff --git a/lisp/vc.el b/lisp/vc.el
index 88d023a422f47b6cdc34afdcbca3abc23ea773fb..fa2d45e1a3a68c87ba446bd555a883a5862a9860 100644 (file)
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -2457,6 +2457,15 @@ to provide the `find-revision' operation instead."
   (funcall update-function
            (mapcar (lambda (file) (list file default-state)) files)))
 
+(defun vc-default-mark-resolved (backend files)
+  (message
+   (substitute-command-keys
+    "Conflicts have been resolved in %s.  \
+Type \\[vc-next-action] to check in changes.")
+   (if (> (length files) 1)
+       (format "%d files" (length files))
+     "this file")))
+
 (defun vc-check-headers ()
   "Check if the current file has any headers in it."
   (interactive)